projects
/
gtk4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
833dbd6
)
GtkStack: Don't mix code and declarations
author
Matthias Clasen
<mclasen@redhat.com>
Sat, 30 May 2015 13:43:56 +0000
(09:43 -0400)
committer
Matthias Clasen
<mclasen@redhat.com>
Sat, 30 May 2015 13:43:56 +0000
(09:43 -0400)
gtk/gtkstack.c
patch
|
blob
|
history
diff --git
a/gtk/gtkstack.c
b/gtk/gtkstack.c
index 0a88a4f884b9fde088881c3cbe3c8f86971768ee..775268999129d7204d13e644b71b9089cb70c559 100644
(file)
--- a/
gtk/gtkstack.c
+++ b/
gtk/gtkstack.c
@@
-2104,10
+2104,12
@@
gtk_stack_size_allocate (GtkWidget *widget,
if (priv->visible_child)
{
int min, nat;
+ GtkAlign valign;
+
gtk_widget_get_preferred_height_for_width (priv->visible_child->widget,
allocation->width,
&min, &nat);
-
GtkAlign
valign = gtk_widget_get_valign (priv->visible_child->widget);
+ valign = gtk_widget_get_valign (priv->visible_child->widget);
child_allocation.height = MAX (nat, allocation->height);
if (valign == GTK_ALIGN_END &&
child_allocation.height > allocation->height)